bitkeeper revision 1.1159.147.2 (41865b310p7czMHOMPp_UCEAvKP2IA)

bad merge

diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index 5c763d1a03c578eefbb29a843a60f15b71cc0642..13312cadb759726e77ded712a4d4f1e40a419999 100644 (file)
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -53,7 +53,7 @@ static void show_handlers(unsigned char key)
 static void dump_registers(unsigned char key)
 {
     struct xen_regs *regs = (struct xen_regs *)get_execution_context();
-    extern void show_registers(struct pt_regs *regs); 
+    extern void show_registers(struct xen_regs *regs); 
     printk("'%c' pressed -> dumping registers\n", key); 
     show_registers(regs); 
 }